Get package name from pyproject.toml, allow arbitrary files in packages #101
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is more dependable, and when we know the package name we can
glob inside it to get all files such as bin or ttf files.
This will allow e.g., 5x8.bin & ov5640_autofocus.bin within
bundles.
the behavior of bundlefly and circup when encountering .bin files
needs to be checked.
Tested by building modified pycamera bundle and the autofocus.bin file
appears in the generated zip files:
```
pycamera-py-ec67bde/lib/adafruit_pycamera/ov5640_autofocus.bin 4077 4096
pycamera-8.x-mpy-ec67bde/lib/adafruit_pycamera/ov5640_autofocus.bin 4077 4096
pycamera-9.x-mpy-ec67bde/lib/adafruit_pycamera/ov5640_autofocus.bin 4077 4096
```
There's at least one library in the bundle that has incorrect metadata
and that leads to an error:
adafruit/Adafruit_CircuitPython_Colorsys#29
jepler
force-pushed
the
include-binary-files-in-package
branch
from
6de3690
to
033bf0a
Compare
jepler
changed the title
|
circup appears to use |
jepler
force-pushed
the
include-binary-files-in-package
branch
from
033bf0a
to
b2116cb
Compare
(it's smaller on disk)
jepler
force-pushed
the
include-binary-files-in-package
branch
from
b2116cb
to
0c58704
Compare
|
This'll require some metadata problems across multiple libs to be corrected. |
jepler
added a commit
to jepler/CircuitPython_Candlesticks
that referenced
this pull request
Nov 30, 2023
This is needed so that we can rely on the metadata in adafruit/circuitpython-build-tools#101 Please make a new tagged release after incorporating this change. If you don't think you'll be able to deal with this in a timely fashion, please let me know.
jepler
added a commit
to jepler/CircuitPython_color_picker
that referenced
this pull request
Nov 30, 2023
This is needed so that we can rely on the metadata in adafruit/circuitpython-build-tools#101 Please make a new tagged release after incorporating this change. If you don't think you'll be able to deal with this in a timely fashion, please let me know.
jepler
added a commit
to jepler/CircuitPython_equalizer
that referenced
this pull request
Nov 30, 2023
This is needed so that we can rely on the metadata in adafruit/circuitpython-build-tools#101 Please make a new tagged release after incorporating this change. If you don't think you'll be able to deal with this in a timely fashion, please let me know.
jepler
added a commit
to jepler/CircuitPython_RGB_SpectrumTools
that referenced
this pull request
Nov 30, 2023
This is needed so that we can rely on the metadata in adafruit/circuitpython-build-tools#101 Please make a new tagged release after incorporating this change. If you don't think you'll be able to deal with this in a timely fashion, please let me know.
jepler
added a commit
to jepler/CircuitPython_scales
that referenced
this pull request
Nov 30, 2023
This is needed so that we can rely on the metadata in adafruit/circuitpython-build-tools#101 Please make a new tagged release after incorporating this change. If you don't think you'll be able to deal with this in a timely fashion, please let me know.
jepler
added a commit
to jepler/CircuitPython_slider
that referenced
this pull request
Nov 30, 2023
This is needed so that we can rely on the metadata in adafruit/circuitpython-build-tools#101 Please make a new tagged release after incorporating this change. If you don't think you'll be able to deal with this in a timely fashion, please let me know.
jepler
added a commit
to jepler/CircuitPython_TemperatureTools
that referenced
this pull request
Nov 30, 2023
This is needed so that we can rely on the metadata in adafruit/circuitpython-build-tools#101 Please make a new tagged release after incorporating this change. If you don't think you'll be able to deal with this in a timely fashion, please let me know.
jepler
added a commit
to jepler/CircuitPython_UBoxplot
that referenced
this pull request
Nov 30, 2023
This is needed so that we can rely on the metadata in adafruit/circuitpython-build-tools#101 Please make a new tagged release after incorporating this change. If you don't think you'll be able to deal with this in a timely fashion, please let me know.
|
The test failure appears to be due to wrong metadata. I think I've filed PRs with every affected library now. |
dhalbert
requested changes
Nov 30, 2023
|
I have settings.toml on the brain because of circuitpython, but it should be pyproject.toml everywhere here. |
dhalbert
changed the title
dhalbert
previously approved these changes
Nov 30, 2023
|
Trying to think of a creative way to let this land without requiring all those libs to be updated. Could be as simple as a blacklist of things that DON'T get the treatment, or disabling it in the communty bundle for now. (allowing the build process to opt out of using the new thing) |
|
I've implemented a simple blacklist (of values that appear in py_modules today and are wrong) so that this can complete CI without all those related issues being closed. |
dhalbert
approved these changes
Dec 3, 2023
tannewt
reviewed
Dec 4, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is more dependable, and when we know the package name we can glob inside it to get all files such as bin or ttf files.
This will allow e.g., 5x8.bin & ov5640_autofocus.bin within
bundles.
the behavior of bundlefly and circup when encountering .bin files needs to be checked.
Tested by building modified pycamera bundle and the autofocus.bin file appears in the generated zip files:
There's at least one library in the bundle that has incorrect metadata and that leads to an error:
adafruit/Adafruit_CircuitPython_Colorsys#29